From: Glenn Morris <rgm@gnu.org>
Date: Mon, 23 Apr 2007 01:20:02 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~644
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9b30e445a8e3a246f5042b3d198d7f18b32a7308;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f41996d6ed..4a57dcd04ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,9 @@
 
 	* button.el (button): Use color for this face on a tty.
 
+	* files.el (magic-mode-alist): Allow for carriage-returns in
+	html-mode entry.
+
 2007-04-22  Richard Stallman  <rms@gnu.org>
 
 	* emacs-lisp/easy-mmode.el (define-globalized-minor-mode):